gtk/gtkhandlebox.c: Do not use gdk_window_get_deskrelative_origin()
authorJavier Jardón <jjardon@gnome.org>
Thu, 9 Sep 2010 00:25:25 +0000 (02:25 +0200)
committerJavier Jardón <jjardon@gnome.org>
Thu, 9 Sep 2010 00:26:43 +0000 (02:26 +0200)
This completes commit bd277fad50704f6a39619cb418204bdfee112b98

gtk/gtkhandlebox.c

index 0221ae6777682ff55caa11d0d06f0c3152d752ea..423a4f25ef03d0cb1f70778d47bfdc764cb86f37 100644 (file)
@@ -57,9 +57,6 @@ struct _GtkHandleBoxPrivate
 
   /* Variables used during a drag
    */
-  gint            deskoff_x;      /* Offset between root relative coords */
-  gint            deskoff_y;      /* and deskrelative coords             */
-
   gint            orig_x;
   gint            orig_y;
 
@@ -1144,13 +1141,11 @@ gtk_handle_box_button_press (GtkWidget      *widget,
            {
              GtkWidget *invisible = gtk_handle_box_get_invisible ();
               GdkWindow *window;
-             gint desk_x, desk_y;
              gint root_x, root_y;
              gint width, height;
 
               gtk_invisible_set_screen (GTK_INVISIBLE (invisible),
                                         gtk_widget_get_screen (GTK_WIDGET (hb)));
-             gdk_window_get_deskrelative_origin (priv->bin_window, &desk_x, &desk_y);
              gdk_window_get_origin (priv->bin_window, &root_x, &root_y);
              gdk_drawable_get_size (priv->bin_window, &width, &height);
 
@@ -1162,9 +1157,6 @@ gtk_handle_box_button_press (GtkWidget      *widget,
              priv->float_allocation.width = width;
              priv->float_allocation.height = height;
 
-             priv->deskoff_x = desk_x - root_x;
-             priv->deskoff_y = desk_y - root_y;
-
               window = gtk_widget_get_window (widget);
              if (gdk_window_is_viewable (window))
                {
@@ -1353,8 +1345,6 @@ gtk_handle_box_motion (GtkWidget      *widget,
       gint width, height;
 
       gdk_drawable_get_size (priv->float_window, &width, &height);
-      new_x += priv->deskoff_x;
-      new_y += priv->deskoff_y;
 
       switch (handle_position)
        {